From 8f27b3fcf6fade010510796193d965f525fbebce Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 23 Nov 2020 21:08:40 +0100
Subject: [PATCH] gtk/window: Let the backend handle toplevel freezing

---
 gdk/gdk-private.h |  3 ---
 gdk/gdksurface.c  | 20 --------------------
 gtk/gtkwindow.c   | 39 ---------------------------------------
 3 files changed, 62 deletions(-)

diff --git a/gdk/gdk-private.h b/gdk/gdk-private.h
index d2d185d57e..3df7d3215c 100644
--- a/gdk/gdk-private.h
+++ b/gdk/gdk-private.h
@@ -15,9 +15,6 @@ gboolean        gdk_device_grab_info            (GdkDisplay  *display,
 
 void            gdk_pre_parse                   (void);
 
-void            gdk_surface_freeze_toplevel_updates      (GdkSurface *surface);
-void            gdk_surface_thaw_toplevel_updates        (GdkSurface *surface);
-
 gboolean        gdk_surface_supports_edge_constraints    (GdkSurface *surface);
 
 void gdk_display_set_double_click_time     (GdkDisplay   *display,
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 25e6f12b27..b0831bcc55 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -1523,26 +1523,6 @@ gdk_surface_thaw_updates (GdkSurface *surface)
           gdk_surface_schedule_update (surface);
         }
     }
-}
-
-void
-gdk_surface_freeze_toplevel_updates (GdkSurface *surface)
-{
-  g_return_if_fail (GDK_IS_SURFACE (surface));
-
-  surface->update_and_descendants_freeze_count++;
-  gdk_surface_freeze_updates (surface);
-}
-
-void
-gdk_surface_thaw_toplevel_updates (GdkSurface *surface)
-{
-  g_return_if_fail (GDK_IS_SURFACE (surface));
-  g_return_if_fail (surface->update_and_descendants_freeze_count > 0);
-
-  surface->update_and_descendants_freeze_count--;
-  gdk_surface_schedule_update (surface);
-  gdk_surface_thaw_updates (surface);
 
 }
 
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index e1d83addbd..fc2cd4a986 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -177,8 +177,6 @@ typedef struct
 
   guint32  initial_timestamp;
 
-  guint16  configure_request_count;
-
   guint    mnemonics_display_timeout_id;
 
   guint    focus_visible_timeout;
@@ -1467,7 +1465,6 @@ gtk_window_init (GtkWindow *window)
   priv->geometry_info = NULL;
   priv->focus_widget = NULL;
   priv->default_widget = NULL;
-  priv->configure_request_count = 0;
   priv->resizable = TRUE;
   priv->configure_notify_received = FALSE;
   priv->need_default_size = TRUE;
@@ -3924,11 +3921,6 @@ gtk_window_unmap (GtkWidget *widget)
   GTK_WIDGET_CLASS (gtk_window_parent_class)->unmap (widget);
   gdk_surface_hide (priv->surface);
 
-  while (priv->configure_request_count > 0)
-    {
-      priv->configure_request_count--;
-      gdk_surface_thaw_toplevel_updates (priv->surface);
-    }
   priv->configure_notify_received = FALSE;
 
   state = gdk_toplevel_get_state (GDK_TOPLEVEL (priv->surface));
@@ -4770,25 +4762,6 @@ surface_size_changed (GtkWidget *widget,
       info->last.configure_request.height = height;
     }
 
-  /* priv->configure_request_count incremented for each
-   * configure request, and decremented to a min of 0 for
-   * each configure notify.
-   *
-   * All it means is that we know we will get at least
-   * priv->configure_request_count more configure notifies.
-   * We could get more configure notifies than that; some
-   * of the configure notifies we get may be unrelated to
-   * the configure requests. But we will get at least
-   * priv->configure_request_count notifies.
-   */
-
-  if (priv->configure_request_count > 0)
-    {
-      priv->configure_request_count -= 1;
-
-      gdk_surface_thaw_toplevel_updates (priv->surface);
-    }
-
   /*
    * If we do need to resize, we do that by:
    *   - setting configure_notify_received to TRUE
@@ -5498,7 +5471,6 @@ gtk_window_move_resize (GtkWindow *window)
 		 "resize:      \t%d x %d\n" 
 		 "size_changed: %d pos_changed: %d hints_changed: %d\n"
 		 "configure_notify_received: %d\n"
-		 "configure_request_count: %d\n"
 		 "position_constraints_changed: %d",
 		 priv->title ? priv->title : "(no title)",
 		 info->last.configure_request.x,
@@ -5519,7 +5491,6 @@ gtk_window_move_resize (GtkWindow *window)
 		 configure_request_pos_changed,
 		 hints_changed,
 		 priv->configure_notify_received,
-		 priv->configure_request_count,
 		 info->position_constraints_changed);
     }
 #endif
@@ -5631,16 +5602,6 @@ gtk_window_move_resize (GtkWindow *window)
        * we don't get the ConfigureNotify back, the resize queue will never be run.
        */
 
-      /* Increment the number of have-not-yet-received-notify requests.
-       * This is done before gdk_surface[_move]_resize(), because
-       * that call might be synchronous (depending on which GDK backend
-       * is being used), so any preparations for its effects must
-       * be done beforehand.
-       */
-      priv->configure_request_count += 1;
-
-      gdk_surface_freeze_toplevel_updates (priv->surface);
-
       /* for GTK_RESIZE_QUEUE toplevels, we are now awaiting a new
        * configure event in response to our resizing request.
        * the configure event will cause a new resize with
-- 
2.30.2